Merge from emacs-24; up to r108025

diff --cc lib-src/ChangeLog
index 23d9689b4df81c43c988bdb5e691e46fbc72ce59,08a587a5efeaa1467a423a7096796af9012223d7..5ab0f54b649bf1cedfc74af2679099c1a425763e
--- 1/lib-src/ChangeLog
--- 2/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@@ -1,3 -1,8 +1,9 @@@
+ 2012-05-31  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS)
+       instead of a literal -mwindows, which is not supported by MSVC.
+       (Bug#11405)
++
  2012-05-30  Stefan Monnier  <monnier@iro.umontreal.ca>
  
        * make-docfile.c: Improve comment style.